Update to changed interfaces