Finished migration into generics