Added missing demo classes