Refactoring for v0.2