add more checks to enumeration