Added working coverage support