Added Market, refactored CorporationMarket