Better handling of the parameters