Work on core coverage extension