Added Dynamic table build