Added event scaffolds