v0.0.4 Enum refactorization