Reworking entity system