Updates to Marketplace wizard functions