Updated with changes from the coverage feature