Add options to CLI
Update documentation