Updated to use enumeration 5.