Better PSR 1 and 2 compatibility