Adding multisite support