Added router structure