Improvement to folder management