Update & use model-router