Added new attribute and table code