Add some feature, correct the validation of the parameters.