Preparing multiple s3 account support