Updates to events functionality