Refactor v0.1.0.2