More work on folder support