Update to use new methods.