Add validations for number of arguments in get and add commands
Merged with master branch