Improved enums parent class integration.