Simplify API, improve perf, 0.0.2