Modified Router constructor