creeated the generics on the master side

Need generics on master side that can be inferred at runtime