Update to latest tools and npm support