Replaced core S3 functions with new S3Datastore object