Removed superfluous enums by replacing abstract classes with enums.