Refactoring to allow market data to be downloaded from alternative venue