Optimize calls, simplify interface