All package information is return to one set. + some type changes.