Add support for specifying subnet_id and vpc_id