Can we put the XML configuration back. Consistency should probably take priority over preference, since we need to consider ramp up time for new developers.