Added support for demos.