Modified architecture