Added extra to item. Some code refactoring.