Changed all of the references to the new interface