Added coverage support