Architecture improved