Improve common connector