Added AdminRouter & better comments