Regrouped Event part and added code samples