Revert "Remove CMAccount"

This reverts commit 01dc67f65f0b76ae75fceacb24017328f9c104f6.