Modified utility scripts