#set( $symbol_pound = '#' )
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
package ${package}.${subpackage}.client.requests;

import com.progressoft.brix.domino.api.client.request.ServerRequest;
import ${package}.${subpackage}.shared.response.${module}Response;
import ${package}.${subpackage}.shared.request.${module}Request;
import com.progressoft.brix.domino.api.client.annotations.Request;
import com.progressoft.brix.domino.api.client.annotations.Path;

@Request
@Path("${module}Request")
public class ${module}ServerRequest extends ServerRequest<${module}Request, ${module}Response> {
    public ${module}ServerRequest(${module}Request requestBean) {
        super(requestBean);
    }
}

@@ -180,525 +180,444 @@
 ent.
-request.ServerRequest;%0Aimport $%7Bpackage%7D.$%7Bsubpackage%7D.shared.response.$%7Bmodule%7DResponse;%0Aimport $%7Bpackage%7D.$%7Bsubpackage%7D.shared.request.$%7Bmodule%7DRequest;%0Aimport com.progressoft.brix.domino.api.client.annotations.Request;%0Aimport com.progressoft.brix.domino.api.client.annotations.Path;%0A%0A@Request%0A@Path(%22$%7Bmodule%7DRequest%22)%0Apublic class $%7Bmodule%7DServerRequest extends ServerRequest%3C$%7Bmodule%7DRequest, $%7Bmodule%7DResponse%3E %7B%0A    public $%7Bmodule%7DServerRequest($%7Bmodule%7DRequest requestBean) %7B%0A        super(requestBean);%0A    %7D%0A%7D%0A
+annotations.Path;%0Aimport com.progressoft.brix.domino.api.client.annotations.RequestFactory;%0Aimport com.progressoft.brix.domino.api.client.request.Response;%0Aimport $%7Bpackage%7D.$%7Bsubpackage%7D.shared.response.$%7Bmodule%7DResponse;%0Aimport $%7Bpackage%7D.$%7Bsubpackage%7D.shared.request.$%7Bmodule%7DRequest;%0A%0A@RequestFactory%0Apublic interface $%7Bmodule%7DRequests %7B%0A    @Path(%22$%7Bmodule%7DRequest%22)%0A    Response%3C$%7Bmodule%7DResponse%3E request($%7Bmodule%7DRequest request);%0A%7D

change the generated module request to use RequestFactory