Added custom folder support