Partial migration to generics