Refactor users to agents