Rebuild entities, re-edit states