Add TODO construct connection content