Continued work on Marketplace feature wizard