Updated to use spring config.