Use the new interface, simplifies code