Added location support