Updated ViewModel with References to Draft & Published Entity