Updated Front-End Architecture