Added parity check support