Restructured inventory to have more functionality