Switch to separate js dependency loading