Remove need for generating the template stub class