Converted to using spring configuration.