Get rid of Fields inner structs