Handle PrivateKey files that are don't fit the existing patterns
Slightly better handling of optional attributes in XML