[IMP]CRM: Optimize code and remove error related to yml file.