Fixed router, added namespace additions.