Refactoring of the optionals parameters