Improvements in v1.0.0