Issue #237 - Add support for local data source