[fix] changed entity semantics