changes to Folder Service