Working on marketplaces module'