DataSource changes and Removed heroku from BuildConfig