Adding in some more generics and enabling a type.