Rewrite to the new format entry model.
Fix typo.