Use map syntax not closure for assigning field names