Added support for npm