Support newer swift client