Removes the aura dependency in the datasources
Fixes a bug in the API on URL building