APOLLO-4008 Moved certificateProviders
APOLLO-4008 Refactored correspondant