Add initial support for S3 and EBS