Rewrote to expose better API
v1.2.0. Improvement