[W-I-P] Refactoring addEntry...