Changed how the targets are being listed and retrieved.