eliminate entity.id, use entity.identity instead