Adds better folder support