Adding mapping of more fields.