Updated XOZE as per enhancements done in add-on