Added Intervention and Charges entities and Migration