added folder and data extension functionality