Improvements to certificates management