Revert "Revert "Model for question""

This reverts commit 650651c8e2244280d5793c090f3d4929f70d5a46.