PSR-2 compatibility + Changes for using servlet request/response