Improve for npm