More DevantXone changes