handled different datasources
Merge branch 'rest_services2'