Update tutorial code for 2.0.0