Move settings into connection