Changed to enumeration