Updated for newer version of packages