Replaced ServiceLocator with SpringContextUtil