ENT-2680 - CAD Portfolio Development