Few upgrades and added different style of CLI script for adding datasources