Refactored to introduce a central ConnectionHandler
Update gviz