Adding subnet_id option for use with VPCs