Update functions to match changes to library.