Update from 1.2.1 to 2.0.0