Some interface changes.