Add cli options and more features