HV-688 Updating to the latest BV API changes