Modifying prim's to include Question Support