Changed model and added question type handlers