Updated for location helpers.