Add more options for cli