Use new EntityUtil method