Add v2 version of demo program