Improve Save Route module