Add wrap by namespace. Fix CRC bug