Improved Event scaffold design