Adding CMSs skills, and some other adjustments.