Updated to use hopjs-common