Add back needed generics