Moved all CNA stuff to SNV side