improved coverage support