Update code in PSR-2