refactor ItemMapper