Move router to instance; include type property
s/Account /Domain /