Adding questions support.
Adding questions support