v0.0.11 Code refactorization