Moved some enums