Add underscore and update other packages