Updated folder management