Added options to CLI