fixing generics and imports