Generics moved to where they belong