Updated entry class