moved add generic types to model