Started refactoring CrowdAgent