Add CRC support