Added FolderResolver