Main broker converted to be service locator aware