Changed structure to table