Use new demo syntax