Added 2 AZ for CF and spiff