Changes due to new interface.