Added more events, better changeset support