Update elements and demo code to work with latest