Add entry model and unit tests