Convergence between Plan and 2030 Agenda