Minor updates
Supports Table 'Charts'