Changed (again) interface structure.