Completing changes to use Config Server