Update and rename Entry.h to Datum.h