Prepare better handling of demo services