Routes improvement