Revert "Rework on Entities"

This reverts commit b3bebb5be775d249e62de7233bf99822bbca267b.
Rework Success