Update demo and getting started code