Move cm extras into seperate file