Added service road and wadi support