Added more folder control