Template Changes and Deploy Scripts