Change fields to the schema agreed