Feature/independent connection