Added mashup mechanism