Added components to code coverage analysis