Multisite compatibility

Fixes #54