Added configuration resultion infrastructre,