Table, Diagram functions debugged according the jira requirements