Add more info to help the #NSA