Updated to latest NH version