Added extra config checks