Use new interface, simplifies code