Added Selfhosting support