Added router functionality