Add support for location extension points