Fixed request classes case