Minor interfaces changes.