Added Attribute related tables