Market data refacto