YH-157: Automatic data sources