Update demo code with new features