Upgrading sample from 0.1.0 to 2.0.0