Refactored MarketAPI model