Update scripts with more common utils