Added the generics controller