Implement new system for code coverage