Added mulitple choice support