Reworked entity