Updated xml and config options