Added ServiceLocator draft