DAR-2759: Reuse some logic