Updated to remove command line interface