Added ability to load demo files directly