Code refactorization: singleton-based enums are statically imported