Update API to support multiple target sets