in progress of adding folder support