Update sample with new structure & events