Added dynamic choice options