Update constructor
Added class for set of events