Architecture modified