migrated new approach to enumerations from RR014 to RR016