Now uses correct template for key material creation