Added some new types for event fulfillment, and some additional cleanup