Further changes for coverage integration