Updated NKIs to latest