Replaced insert & update by save inside the EntityService