Started refactoring item name retrieval