Added location validation