Added strict mapping for fields.