Added options to cmd_crypto which will be moved into separate handlers
merging changes