[WIP] Added ADD/PREPEND Tags for Events