Streamlined events. Updated usage examples