Moved to enums from flags