DefaultItemsModel code refactored