Upgraded the creation of CAM events