Moved to S3 gateway development