#305 Refactor generics usage
These changes would give compiler errors before the refactoring of generics
#305 Correction