Working on NPM integration