Adding preliminary EC2 functionality