Refactored the entry class.