Added canvas and table names