Update demo to work with API updates