Rework enums