Added locator and goto commands.