Rework with incompatible changes. Release as v1.0.0