Added controller and router