Adjust to new interface.