Made config object actually optional now