Updated to latest moxie-js changes