This makes it more inline with other data we collect, and can be used to make some info optional at some point. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>