Added new folder context option.