Seperate configurable components out and let them be loaded from Spring configuration file
Fix problems after merge