Improve with connector config