Added functionality for folders