Updated to support latest npm packages