Added missing type parameters