Improved pkg creation.