Updates to VCF services to be in line with core-db changes