Added support for the demo