switched to new keystore format