Added questions scaffolding