Change to use CamelSvc