Work on Router integration