Matching changes for PHP and node