Added support for pre-V1 fields and refactored some CDFIELD enums slightly