Move immigration status to the defendant model; add some associations