Improve the package