Added tracking for support libraries...