add File System stuff back from CM