Update to data sources, added checksum checking