added subfields and type