Feature/new events