Added more features to ec2 driver