[TASK] Make general improvments to the features of the CMS