Move table model outside #27