Switch to new interface