Added Table and Graph