TD-3998 Update refactoring since default parameters are not allowed