Added support for more data sources and refactored the spring-cloud configuration