Update code in the Entity core file in PSR-2