Added ConnectionTimeout and BindAddress support