Update configs, add Xwrapper override