Updated libraries
Renamed MerchantHandler to MarketHandler