Added connection settings and some cleanup of auto generated sample settings