Added mashup functionality