Revamp the entire architecture