Add support for Marketplace ID