Added @:generic to template classes