Add more options to CLI