Added more to electron and event