Packaging updated to be architecture independent