Added questiontype_v2