Update common-functions.php