Refactored PkgBuilder