Further implemented the packaging system