Improved the package structure