Updated Architecture