Add 3rd party dir support