VS Connection Refactor