Added multi-site support