Simplify interface a little more