Updated Architecture snapshot