Update Router class with new traverse code