Refactor to allow multiple target values