Better demo service handling