[WIP] Support Marketplace products