Full roll-out of National ID System now set for 2020