Entry implementation changed from abstract
Enum added