can we do the same here that we did for the other DSL methods, put each implementation in the v6/v7 class and lose the if statement?