Add better PKCS8 support