Improved question model