Adding EC2 Client Support (not completeted)