Improvements for v0.0.8