Revise system architecture