Add support for Enum and numeric values in command options
Fix user existence check
Merge branch 'fix_user_existence_check'