Updated enumeration library