Adds missing generics