Simplify interface. No need for the other junk