Changes to add spring-bean-configuration