Final commits for v2.0