Updated APITableModel