Add generic types support.