Replace dap by service