think it's worth adding an enum {WGT, XPK}  PackageType(don't we have it already anywhere in package classes? ) , a property and a getter 'packageType' so that it is not calculated every time.