Changed the way list events were handled on Setup