Updated to include external code coverage