Adding some changes to generate the packages