Packaging updates to match modern preferred practices