Improved multi-site functionality