Support for naq-js-common