Added support for multiple connections - TODO: Fix editing