Added Question handling code