Update entity not overwrite

Let's discuss about the update for the entity when you're back