Update to cli and error handling for tables