Updated utility scripts