added the rest of the supported fields