Improved Inventory API