Update to reflect NSA support