Updated class diagrams, class diagram for mashup constructor component, updated future work.