Added check for existing site