Removed hard coded question type