Add s3 staging support