When the connector becomes prod ready I will push for a refactor to use that instead.