Added more choices to model and modified single_chart for those selections