PAL: Perf improvements - more data sources