Function w/ same name
Better naming for mapping
Needed to update some structure in Item