Improves coverage and package