Progress on PSR-2 compliance