Modified Router to use a context throughout