Simplify agent and token management