Changes for CSL-m validation