[Common] IDaoFactory, IServiceLocator Modifications