Add domain router
Update router and add facade
Fix tests