Update to using new javascript integration