Properly handle tables