Added availability zone support to ec2 module