Moving to a full XML-less config