Fixed generics import