Removed dependency on APIv2 being in the main repo