+Added builder elements
+Adjusted modifier function to be one size fits all (should work for any event type)