Adding support for json/xml locale files and making changes to support
more connection types.