Re-add Entity class