Switched enums to java enums