Changed base type to base types