added router support