Added ability to add attributes per-table.