Add discouraged to schema (and with statement demo feature) (#2388)

Add discouraged to schema (and with statement demo feature) (#2388) #887