Working on Router class