Updated Router sample