Adding support for connectionString and wcf endpoints