Added events and comments