Moved enums to own file