add new etagged router and clean up wrapper additions