Minor refractor of entry model.

Threadsafe funsies.