Adding GCE and Abiquo support