Enhance package coverage