Yes, both must be covered by CSI and, as my current issue is teaching me, you should find out exactly what CSI is from the German authority because there is no European precedent for this, thus every country will have different definitions of what is "comprehensive" (in my case, which is i...