Added nested mappings in fields