Add auto-creation of folders