Make compliant with PSR Streams