Updated for new package versions