Changed login to use Field instead of FieldMap