Update Storage cmdlets to address CRs