CLOUD-282 Update event/usage generation mechanism