improve router architecture