Update code and readme for the latest packages.