Move comments to ConnectionStrategy fields