Added support for demo project