refactored Investigator and Batch models