Routing improvments and persisten modelHandler