Initial events implementation was restored