Add ConnectionRegistry to handle multiple connections easier