Greatly enhanced functionality of Inventory