Typehint factory method arguments and remove ServiceRequest