extended entry model
fix merging