Refactoring of  FW\Di\ServiceLocator