Updated Component Diagram and added Activity Diagram