Add support for unified inventory and skins