Minor router model changes