Added extra router layer