Update Locator to support greater template customization

Closes #16