added <router> support