Added support for non ORM data source