added ami and customer gateway support