lib additions + more metrics