Added embedded datasource