Updated to latest interface.