More stuff to handle config from zero