Updated to support XML Config versus properties files