Updated Router class