Added demonstration classes