Feature/connector