refs #7 #8 #11 - Many configuration optimization