Update with more paths and some fixes.

We update the package with more paths monitored and some fixes in the code.

Why a "new" allocation here?