Removed SQL changes as they proved to be slower than the memory data source. Will come back to these for future enhancement.