Revert "IEntity added"

This reverts commit 359460fbed2ce96ccf85b415eee4fba4588c13cb.
Revert "Revert "IEntity added""

This reverts commit dcdf3a51a67a3a7a2199e92617a6fe9eb1028d1b.