increased list of handled files, more robust dependency handling