Updated enumiration of folders