Changes for use in Spring IOC