refactored usage of new psr http-message