Addapting to ExTh chages for enums.