Improved Packer support