FIX : add comp to RawKIT