Adding CommonServiceLocator