Configuration builder re-factory