Updated to properly handle utility scripts