Added entry class. Fixed I18n.