Refactor req to Server property