0.0.6 optimizations and api change