Add generic types