Switching from bools to enums