Updated with command line tool and Tables