Performance improvements
0.3.0