Added Setup List
Changes to data structure and ViewModel