WpsClient improves; Measurement package near final - problems detectes with composite ID