Updated to use to Neutron APIs for all