Updated for Pvc.Core changes