Events functionality completed