Adding config stuff to everything (not yet tested)