Modified architecture of last version