Prepare for new demo service