Refactored the table parsing to make it work like all other parsings