Added support for the Folders plugin