Added inventory management support