Use the new DisplayField handling and the new EntryTypeKeys on the Handlers