Extend demo service