Added spring service support