Req data refactoring