- added configuration for mashup
- added basic handling for demo [to do]