Added location support.