Added code to parse tables