* Updated coverage implementation