Updated for current nodejs version