First batch of updates to XEP