Add support for folders