Improved findFiles