v0.0.3 Refactorization