Expanded base data source, added accessors