refactored EntryParser