Major changes to Entries