fix entity and add util