0.0.6 performance optimizations