more refactor User to Dispatch