Add CMFileManager and LockClock