Added isDemo support