Support certificates better in the builder