Added NII conversion if required