minor changes to entry model