@Alex Fisher I'm still unsure. My initial thought was to not add the shims at all and drop all the legacy functions