Added circular buffers and market data