Update for packing and configuration changes