Align to CC and OPC APIs