Converting models to have common agent table, part 1