Align to new OPC API (again)