Added support for S3 events