Ammended Router class

Added further functionality