Move ustate and user handling to Text subsystem