Adapts PSR interface changes