Updating to match packaging practices