Update(major): Updated to server with Locator