committed changes related to spring-bean config