Better subfolder support