Added a few more uses of EpwDataField enum