Add basic service locator functionality