Fixed to Support new 3 table Inventory structures

Supports 3 tables for Inventory data