Updating DataAs to handle select and checkbox