Added location helpers, etc.