Moved Context class call to Router constructor