Reduce to one shared @api connection

Less code complexity.