Updating Router and Controller