Added codec and router -> registry