Added MarketType management, added support for multiple market types for each Tenant