Add proper Request/Response type