Updated for XArgs modification