Fixed CommonServiceLocator reference and implementation