Subfolder support added