Update demo to use upcoming 0.4.0