Added checks for cnapi