Updated Architecture and design