Change to the way S3 callbacks are used