Updated Architecture diagram