Router updates, introducing Controller