Switching to Enums for states