Updated Component diagram