Added forcing of viapoints and security distance features