Modified Marketplace class