Map and add fields