Final update for 2.0.0