Removed complicated generator method,add content to table generated