Adding stuff to deal with configuration resolving