Update to match current xac.js source