Further decoupling of Text