Added more mrf_question functionality