Added multiple location support