Added target proxy support