modified Marketplace class