Updates to work with latest interface.