Improve Packaging distribution