Added logic to load demos