I should have mentioned, we are at Desktop 10.0. Unfortunately, I have to upgrade the database (9.2) to 10.0 before I can upgrade my Desktops to 10.1. I'd much prefer to get the database out of the way before tackling the Desktop upgrades, but I'll definitely investigate the Python add-on at 10.1, which would at least minimize the gap where I can't automate some of the broken datasource issues. Thanks.