Updated router class