Major changes for v1.0.0