Another minor changes to interface.