Improved Multisite Support